From 3771c95c72d591d3ed6ecf143fa85e1fea0a3d11 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 6 Jan 2018 09:36:55 -0500 Subject: [PATCH] gsk: Move Vulkan sources to a subdirectory Following what was already done for GL. --- gsk/gskrenderer.c | 2 +- gsk/meson.build | 46 +++++++++---------- gsk/{ => vulkan}/gskvulkanblendmodepipeline.c | 0 .../gskvulkanblendmodepipelineprivate.h | 0 gsk/{ => vulkan}/gskvulkanblurpipeline.c | 0 .../gskvulkanblurpipelineprivate.h | 0 gsk/{ => vulkan}/gskvulkanborderpipeline.c | 0 .../gskvulkanborderpipelineprivate.h | 0 gsk/{ => vulkan}/gskvulkanboxshadowpipeline.c | 0 .../gskvulkanboxshadowpipelineprivate.h | 0 gsk/{ => vulkan}/gskvulkanbuffer.c | 0 gsk/{ => vulkan}/gskvulkanbufferprivate.h | 0 gsk/{ => vulkan}/gskvulkanclip.c | 0 gsk/{ => vulkan}/gskvulkanclipprivate.h | 0 gsk/{ => vulkan}/gskvulkancolorpipeline.c | 0 .../gskvulkancolorpipelineprivate.h | 0 gsk/{ => vulkan}/gskvulkancolortextpipeline.c | 0 .../gskvulkancolortextpipelineprivate.h | 0 gsk/{ => vulkan}/gskvulkancommandpool.c | 0 .../gskvulkancommandpoolprivate.h | 0 gsk/{ => vulkan}/gskvulkancrossfadepipeline.c | 0 .../gskvulkancrossfadepipelineprivate.h | 0 gsk/{ => vulkan}/gskvulkaneffectpipeline.c | 0 .../gskvulkaneffectpipelineprivate.h | 0 gsk/{ => vulkan}/gskvulkanglyphcache.c | 0 gsk/{ => vulkan}/gskvulkanglyphcacheprivate.h | 0 gsk/{ => vulkan}/gskvulkanimage.c | 0 gsk/{ => vulkan}/gskvulkanimageprivate.h | 2 +- .../gskvulkanlineargradientpipeline.c | 0 .../gskvulkanlineargradientpipelineprivate.h | 0 gsk/{ => vulkan}/gskvulkanmemory.c | 0 gsk/{ => vulkan}/gskvulkanmemoryprivate.h | 0 gsk/{ => vulkan}/gskvulkanpipeline.c | 0 gsk/{ => vulkan}/gskvulkanpipelineprivate.h | 0 gsk/{ => vulkan}/gskvulkanpushconstants.c | 0 .../gskvulkanpushconstantsprivate.h | 2 +- gsk/{ => vulkan}/gskvulkanrender.c | 0 gsk/{ => vulkan}/gskvulkanrenderer.c | 0 gsk/{ => vulkan}/gskvulkanrendererprivate.h | 2 +- gsk/{ => vulkan}/gskvulkanrenderpass.c | 0 gsk/{ => vulkan}/gskvulkanrenderpassprivate.h | 4 +- gsk/{ => vulkan}/gskvulkanrenderprivate.h | 6 +-- gsk/{ => vulkan}/gskvulkanshader.c | 0 gsk/{ => vulkan}/gskvulkanshaderprivate.h | 0 gsk/{ => vulkan}/gskvulkantextpipeline.c | 0 .../gskvulkantextpipelineprivate.h | 0 gsk/{ => vulkan}/gskvulkantexturepipeline.c | 0 .../gskvulkantexturepipelineprivate.h | 0 48 files changed, 32 insertions(+), 32 deletions(-) rename gsk/{ => vulkan}/gskvulkanblendmodepipeline.c (100%) rename gsk/{ => vulkan}/gskvulkanblendmodepipelineprivate.h (100%) rename gsk/{ => vulkan}/gskvulkanblurpipeline.c (100%) rename gsk/{ => vulkan}/gskvulkanblurpipelineprivate.h (100%) rename gsk/{ => vulkan}/gskvulkanborderpipeline.c (100%) rename gsk/{ => vulkan}/gskvulkanborderpipelineprivate.h (100%) rename gsk/{ => vulkan}/gskvulkanboxshadowpipeline.c (100%) rename gsk/{ => vulkan}/gskvulkanboxshadowpipelineprivate.h (100%) rename gsk/{ => vulkan}/gskvulkanbuffer.c (100%) rename gsk/{ => vulkan}/gskvulkanbufferprivate.h (100%) rename gsk/{ => vulkan}/gskvulkanclip.c (100%) rename gsk/{ => vulkan}/gskvulkanclipprivate.h (100%) rename gsk/{ => vulkan}/gskvulkancolorpipeline.c (100%) rename gsk/{ => vulkan}/gskvulkancolorpipelineprivate.h (100%) rename gsk/{ => vulkan}/gskvulkancolortextpipeline.c (100%) rename gsk/{ => vulkan}/gskvulkancolortextpipelineprivate.h (100%) rename gsk/{ => vulkan}/gskvulkancommandpool.c (100%) rename gsk/{ => vulkan}/gskvulkancommandpoolprivate.h (100%) rename gsk/{ => vulkan}/gskvulkancrossfadepipeline.c (100%) rename gsk/{ => vulkan}/gskvulkancrossfadepipelineprivate.h (100%) rename gsk/{ => vulkan}/gskvulkaneffectpipeline.c (100%) rename gsk/{ => vulkan}/gskvulkaneffectpipelineprivate.h (100%) rename gsk/{ => vulkan}/gskvulkanglyphcache.c (100%) rename gsk/{ => vulkan}/gskvulkanglyphcacheprivate.h (100%) rename gsk/{ => vulkan}/gskvulkanimage.c (100%) rename gsk/{ => vulkan}/gskvulkanimageprivate.h (98%) rename gsk/{ => vulkan}/gskvulkanlineargradientpipeline.c (100%) rename gsk/{ => vulkan}/gskvulkanlineargradientpipelineprivate.h (100%) rename gsk/{ => vulkan}/gskvulkanmemory.c (100%) rename gsk/{ => vulkan}/gskvulkanmemoryprivate.h (100%) rename gsk/{ => vulkan}/gskvulkanpipeline.c (100%) rename gsk/{ => vulkan}/gskvulkanpipelineprivate.h (100%) rename gsk/{ => vulkan}/gskvulkanpushconstants.c (100%) rename gsk/{ => vulkan}/gskvulkanpushconstantsprivate.h (98%) rename gsk/{ => vulkan}/gskvulkanrender.c (100%) rename gsk/{ => vulkan}/gskvulkanrenderer.c (100%) rename gsk/{ => vulkan}/gskvulkanrendererprivate.h (98%) rename gsk/{ => vulkan}/gskvulkanrenderpass.c (100%) rename gsk/{ => vulkan}/gskvulkanrenderpassprivate.h (97%) rename gsk/{ => vulkan}/gskvulkanrenderprivate.h (97%) rename gsk/{ => vulkan}/gskvulkanshader.c (100%) rename gsk/{ => vulkan}/gskvulkanshaderprivate.h (100%) rename gsk/{ => vulkan}/gskvulkantextpipeline.c (100%) rename gsk/{ => vulkan}/gskvulkantextpipelineprivate.h (100%) rename gsk/{ => vulkan}/gskvulkantexturepipeline.c (100%) rename gsk/{ => vulkan}/gskvulkantexturepipelineprivate.h (100%) diff --git a/gsk/gskrenderer.c b/gsk/gskrenderer.c index 9bdfd6a26a..0e661792fc 100644 --- a/gsk/gskrenderer.c +++ b/gsk/gskrenderer.c @@ -59,7 +59,7 @@ #include "gskbroadwayrendererprivate.h" #endif #ifdef GDK_RENDERING_VULKAN -#include "gskvulkanrendererprivate.h" +#include "vulkan/gskvulkanrendererprivate.h" #endif typedef struct diff --git a/gsk/meson.build b/gsk/meson.build index e110c65e54..b852237629 100644 --- a/gsk/meson.build +++ b/gsk/meson.build @@ -63,29 +63,29 @@ gsk_private_vulkan_compiled_shaders_deps = [] if have_vulkan gsk_private_sources += files([ - 'gskvulkanblendmodepipeline.c', - 'gskvulkanblurpipeline.c', - 'gskvulkanborderpipeline.c', - 'gskvulkanboxshadowpipeline.c', - 'gskvulkanbuffer.c', - 'gskvulkanclip.c', - 'gskvulkancolorpipeline.c', - 'gskvulkancolortextpipeline.c', - 'gskvulkancrossfadepipeline.c', - 'gskvulkancommandpool.c', - 'gskvulkaneffectpipeline.c', - 'gskvulkanglyphcache.c', - 'gskvulkanlineargradientpipeline.c', - 'gskvulkanimage.c', - 'gskvulkantextpipeline.c', - 'gskvulkantexturepipeline.c', - 'gskvulkanmemory.c', - 'gskvulkanpipeline.c', - 'gskvulkanpushconstants.c', - 'gskvulkanrender.c', - 'gskvulkanrenderer.c', - 'gskvulkanrenderpass.c', - 'gskvulkanshader.c', + 'vulkan/gskvulkanblendmodepipeline.c', + 'vulkan/gskvulkanblurpipeline.c', + 'vulkan/gskvulkanborderpipeline.c', + 'vulkan/gskvulkanboxshadowpipeline.c', + 'vulkan/gskvulkanbuffer.c', + 'vulkan/gskvulkanclip.c', + 'vulkan/gskvulkancolorpipeline.c', + 'vulkan/gskvulkancolortextpipeline.c', + 'vulkan/gskvulkancrossfadepipeline.c', + 'vulkan/gskvulkancommandpool.c', + 'vulkan/gskvulkaneffectpipeline.c', + 'vulkan/gskvulkanglyphcache.c', + 'vulkan/gskvulkanlineargradientpipeline.c', + 'vulkan/gskvulkanimage.c', + 'vulkan/gskvulkantextpipeline.c', + 'vulkan/gskvulkantexturepipeline.c', + 'vulkan/gskvulkanmemory.c', + 'vulkan/gskvulkanpipeline.c', + 'vulkan/gskvulkanpushconstants.c', + 'vulkan/gskvulkanrender.c', + 'vulkan/gskvulkanrenderer.c', + 'vulkan/gskvulkanrenderpass.c', + 'vulkan/gskvulkanshader.c', ]) subdir('resources/vulkan') diff --git a/gsk/gskvulkanblendmodepipeline.c b/gsk/vulkan/gskvulkanblendmodepipeline.c similarity index 100% rename from gsk/gskvulkanblendmodepipeline.c rename to gsk/vulkan/gskvulkanblendmodepipeline.c diff --git a/gsk/gskvulkanblendmodepipelineprivate.h b/gsk/vulkan/gskvulkanblendmodepipelineprivate.h similarity index 100% rename from gsk/gskvulkanblendmodepipelineprivate.h rename to gsk/vulkan/gskvulkanblendmodepipelineprivate.h diff --git a/gsk/gskvulkanblurpipeline.c b/gsk/vulkan/gskvulkanblurpipeline.c similarity index 100% rename from gsk/gskvulkanblurpipeline.c rename to gsk/vulkan/gskvulkanblurpipeline.c diff --git a/gsk/gskvulkanblurpipelineprivate.h b/gsk/vulkan/gskvulkanblurpipelineprivate.h similarity index 100% rename from gsk/gskvulkanblurpipelineprivate.h rename to gsk/vulkan/gskvulkanblurpipelineprivate.h diff --git a/gsk/gskvulkanborderpipeline.c b/gsk/vulkan/gskvulkanborderpipeline.c similarity index 100% rename from gsk/gskvulkanborderpipeline.c rename to gsk/vulkan/gskvulkanborderpipeline.c diff --git a/gsk/gskvulkanborderpipelineprivate.h b/gsk/vulkan/gskvulkanborderpipelineprivate.h similarity index 100% rename from gsk/gskvulkanborderpipelineprivate.h rename to gsk/vulkan/gskvulkanborderpipelineprivate.h diff --git a/gsk/gskvulkanboxshadowpipeline.c b/gsk/vulkan/gskvulkanboxshadowpipeline.c similarity index 100% rename from gsk/gskvulkanboxshadowpipeline.c rename to gsk/vulkan/gskvulkanboxshadowpipeline.c diff --git a/gsk/gskvulkanboxshadowpipelineprivate.h b/gsk/vulkan/gskvulkanboxshadowpipelineprivate.h similarity index 100% rename from gsk/gskvulkanboxshadowpipelineprivate.h rename to gsk/vulkan/gskvulkanboxshadowpipelineprivate.h diff --git a/gsk/gskvulkanbuffer.c b/gsk/vulkan/gskvulkanbuffer.c similarity index 100% rename from gsk/gskvulkanbuffer.c rename to gsk/vulkan/gskvulkanbuffer.c diff --git a/gsk/gskvulkanbufferprivate.h b/gsk/vulkan/gskvulkanbufferprivate.h similarity index 100% rename from gsk/gskvulkanbufferprivate.h rename to gsk/vulkan/gskvulkanbufferprivate.h diff --git a/gsk/gskvulkanclip.c b/gsk/vulkan/gskvulkanclip.c similarity index 100% rename from gsk/gskvulkanclip.c rename to gsk/vulkan/gskvulkanclip.c diff --git a/gsk/gskvulkanclipprivate.h b/gsk/vulkan/gskvulkanclipprivate.h similarity index 100% rename from gsk/gskvulkanclipprivate.h rename to gsk/vulkan/gskvulkanclipprivate.h diff --git a/gsk/gskvulkancolorpipeline.c b/gsk/vulkan/gskvulkancolorpipeline.c similarity index 100% rename from gsk/gskvulkancolorpipeline.c rename to gsk/vulkan/gskvulkancolorpipeline.c diff --git a/gsk/gskvulkancolorpipelineprivate.h b/gsk/vulkan/gskvulkancolorpipelineprivate.h similarity index 100% rename from gsk/gskvulkancolorpipelineprivate.h rename to gsk/vulkan/gskvulkancolorpipelineprivate.h diff --git a/gsk/gskvulkancolortextpipeline.c b/gsk/vulkan/gskvulkancolortextpipeline.c similarity index 100% rename from gsk/gskvulkancolortextpipeline.c rename to gsk/vulkan/gskvulkancolortextpipeline.c diff --git a/gsk/gskvulkancolortextpipelineprivate.h b/gsk/vulkan/gskvulkancolortextpipelineprivate.h similarity index 100% rename from gsk/gskvulkancolortextpipelineprivate.h rename to gsk/vulkan/gskvulkancolortextpipelineprivate.h diff --git a/gsk/gskvulkancommandpool.c b/gsk/vulkan/gskvulkancommandpool.c similarity index 100% rename from gsk/gskvulkancommandpool.c rename to gsk/vulkan/gskvulkancommandpool.c diff --git a/gsk/gskvulkancommandpoolprivate.h b/gsk/vulkan/gskvulkancommandpoolprivate.h similarity index 100% rename from gsk/gskvulkancommandpoolprivate.h rename to gsk/vulkan/gskvulkancommandpoolprivate.h diff --git a/gsk/gskvulkancrossfadepipeline.c b/gsk/vulkan/gskvulkancrossfadepipeline.c similarity index 100% rename from gsk/gskvulkancrossfadepipeline.c rename to gsk/vulkan/gskvulkancrossfadepipeline.c diff --git a/gsk/gskvulkancrossfadepipelineprivate.h b/gsk/vulkan/gskvulkancrossfadepipelineprivate.h similarity index 100% rename from gsk/gskvulkancrossfadepipelineprivate.h rename to gsk/vulkan/gskvulkancrossfadepipelineprivate.h diff --git a/gsk/gskvulkaneffectpipeline.c b/gsk/vulkan/gskvulkaneffectpipeline.c similarity index 100% rename from gsk/gskvulkaneffectpipeline.c rename to gsk/vulkan/gskvulkaneffectpipeline.c diff --git a/gsk/gskvulkaneffectpipelineprivate.h b/gsk/vulkan/gskvulkaneffectpipelineprivate.h similarity index 100% rename from gsk/gskvulkaneffectpipelineprivate.h rename to gsk/vulkan/gskvulkaneffectpipelineprivate.h diff --git a/gsk/gskvulkanglyphcache.c b/gsk/vulkan/gskvulkanglyphcache.c similarity index 100% rename from gsk/gskvulkanglyphcache.c rename to gsk/vulkan/gskvulkanglyphcache.c diff --git a/gsk/gskvulkanglyphcacheprivate.h b/gsk/vulkan/gskvulkanglyphcacheprivate.h similarity index 100% rename from gsk/gskvulkanglyphcacheprivate.h rename to gsk/vulkan/gskvulkanglyphcacheprivate.h diff --git a/gsk/gskvulkanimage.c b/gsk/vulkan/gskvulkanimage.c similarity index 100% rename from gsk/gskvulkanimage.c rename to gsk/vulkan/gskvulkanimage.c diff --git a/gsk/gskvulkanimageprivate.h b/gsk/vulkan/gskvulkanimageprivate.h similarity index 98% rename from gsk/gskvulkanimageprivate.h rename to gsk/vulkan/gskvulkanimageprivate.h index 20c49aa94e..e775fe0b2c 100644 --- a/gsk/gskvulkanimageprivate.h +++ b/gsk/vulkan/gskvulkanimageprivate.h @@ -3,7 +3,7 @@ #include -#include "gsk/gskvulkancommandpoolprivate.h" +#include "gskvulkancommandpoolprivate.h" G_BEGIN_DECLS diff --git a/gsk/gskvulkanlineargradientpipeline.c b/gsk/vulkan/gskvulkanlineargradientpipeline.c similarity index 100% rename from gsk/gskvulkanlineargradientpipeline.c rename to gsk/vulkan/gskvulkanlineargradientpipeline.c diff --git a/gsk/gskvulkanlineargradientpipelineprivate.h b/gsk/vulkan/gskvulkanlineargradientpipelineprivate.h similarity index 100% rename from gsk/gskvulkanlineargradientpipelineprivate.h rename to gsk/vulkan/gskvulkanlineargradientpipelineprivate.h diff --git a/gsk/gskvulkanmemory.c b/gsk/vulkan/gskvulkanmemory.c similarity index 100% rename from gsk/gskvulkanmemory.c rename to gsk/vulkan/gskvulkanmemory.c diff --git a/gsk/gskvulkanmemoryprivate.h b/gsk/vulkan/gskvulkanmemoryprivate.h similarity index 100% rename from gsk/gskvulkanmemoryprivate.h rename to gsk/vulkan/gskvulkanmemoryprivate.h diff --git a/gsk/gskvulkanpipeline.c b/gsk/vulkan/gskvulkanpipeline.c similarity index 100% rename from gsk/gskvulkanpipeline.c rename to gsk/vulkan/gskvulkanpipeline.c diff --git a/gsk/gskvulkanpipelineprivate.h b/gsk/vulkan/gskvulkanpipelineprivate.h similarity index 100% rename from gsk/gskvulkanpipelineprivate.h rename to gsk/vulkan/gskvulkanpipelineprivate.h diff --git a/gsk/gskvulkanpushconstants.c b/gsk/vulkan/gskvulkanpushconstants.c similarity index 100% rename from gsk/gskvulkanpushconstants.c rename to gsk/vulkan/gskvulkanpushconstants.c diff --git a/gsk/gskvulkanpushconstantsprivate.h b/gsk/vulkan/gskvulkanpushconstantsprivate.h similarity index 98% rename from gsk/gskvulkanpushconstantsprivate.h rename to gsk/vulkan/gskvulkanpushconstantsprivate.h index 541a51f721..897d9c61fc 100644 --- a/gsk/gskvulkanpushconstantsprivate.h +++ b/gsk/vulkan/gskvulkanpushconstantsprivate.h @@ -3,7 +3,7 @@ #include #include -#include +#include "gskvulkanclipprivate.h" G_BEGIN_DECLS diff --git a/gsk/gskvulkanrender.c b/gsk/vulkan/gskvulkanrender.c similarity index 100% rename from gsk/gskvulkanrender.c rename to gsk/vulkan/gskvulkanrender.c diff --git a/gsk/gskvulkanrenderer.c b/gsk/vulkan/gskvulkanrenderer.c similarity index 100% rename from gsk/gskvulkanrenderer.c rename to gsk/vulkan/gskvulkanrenderer.c diff --git a/gsk/gskvulkanrendererprivate.h b/gsk/vulkan/gskvulkanrendererprivate.h similarity index 98% rename from gsk/gskvulkanrendererprivate.h rename to gsk/vulkan/gskvulkanrendererprivate.h index 42ffc22c04..1e7d78a7ed 100644 --- a/gsk/gskvulkanrendererprivate.h +++ b/gsk/vulkan/gskvulkanrendererprivate.h @@ -4,7 +4,7 @@ #include #include -#include "gsk/gskvulkanimageprivate.h" +#include "gskvulkanimageprivate.h" G_BEGIN_DECLS diff --git a/gsk/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c similarity index 100% rename from gsk/gskvulkanrenderpass.c rename to gsk/vulkan/gskvulkanrenderpass.c diff --git a/gsk/gskvulkanrenderpassprivate.h b/gsk/vulkan/gskvulkanrenderpassprivate.h similarity index 97% rename from gsk/gskvulkanrenderpassprivate.h rename to gsk/vulkan/gskvulkanrenderpassprivate.h index 4ec8f4ea18..379db3bac2 100644 --- a/gsk/gskvulkanrenderpassprivate.h +++ b/gsk/vulkan/gskvulkanrenderpassprivate.h @@ -4,8 +4,8 @@ #include #include -#include "gsk/gskvulkanbufferprivate.h" -#include "gsk/gskvulkanrenderprivate.h" +#include "gskvulkanbufferprivate.h" +#include "gskvulkanrenderprivate.h" #include "gsk/gskprivate.h" G_BEGIN_DECLS diff --git a/gsk/gskvulkanrenderprivate.h b/gsk/vulkan/gskvulkanrenderprivate.h similarity index 97% rename from gsk/gskvulkanrenderprivate.h rename to gsk/vulkan/gskvulkanrenderprivate.h index eb0b68863e..45cfa38b59 100644 --- a/gsk/gskvulkanrenderprivate.h +++ b/gsk/vulkan/gskvulkanrenderprivate.h @@ -4,9 +4,9 @@ #include #include -#include "gsk/gskvulkanimageprivate.h" -#include "gsk/gskvulkanpipelineprivate.h" -#include "gsk/gskvulkanrenderpassprivate.h" +#include "gskvulkanimageprivate.h" +#include "gskvulkanpipelineprivate.h" +#include "gskvulkanrenderpassprivate.h" #include "gsk/gskprivate.h" G_BEGIN_DECLS diff --git a/gsk/gskvulkanshader.c b/gsk/vulkan/gskvulkanshader.c similarity index 100% rename from gsk/gskvulkanshader.c rename to gsk/vulkan/gskvulkanshader.c diff --git a/gsk/gskvulkanshaderprivate.h b/gsk/vulkan/gskvulkanshaderprivate.h similarity index 100% rename from gsk/gskvulkanshaderprivate.h rename to gsk/vulkan/gskvulkanshaderprivate.h diff --git a/gsk/gskvulkantextpipeline.c b/gsk/vulkan/gskvulkantextpipeline.c similarity index 100% rename from gsk/gskvulkantextpipeline.c rename to gsk/vulkan/gskvulkantextpipeline.c diff --git a/gsk/gskvulkantextpipelineprivate.h b/gsk/vulkan/gskvulkantextpipelineprivate.h similarity index 100% rename from gsk/gskvulkantextpipelineprivate.h rename to gsk/vulkan/gskvulkantextpipelineprivate.h diff --git a/gsk/gskvulkantexturepipeline.c b/gsk/vulkan/gskvulkantexturepipeline.c similarity index 100% rename from gsk/gskvulkantexturepipeline.c rename to gsk/vulkan/gskvulkantexturepipeline.c diff --git a/gsk/gskvulkantexturepipelineprivate.h b/gsk/vulkan/gskvulkantexturepipelineprivate.h similarity index 100% rename from gsk/gskvulkantexturepipelineprivate.h rename to gsk/vulkan/gskvulkantexturepipelineprivate.h -- 2.30.2